Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 26 Apr 2010 12:48:35 +0000 (12:48 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 26 Apr 2010 12:48:35 +0000 (12:48 +0000)
commite0a649501bafa947496d973173e73bdbcdf02308
tree4f9b321fa08635fb1d247177cd92f406949ec45c
parentb9103a307cea6c87fb410a15972b458af8a7bbea
parent7c88ae87c5408b649b801ee114a51d439860ef15
Merge from mainline.